tgupdate: merge t/girocco/style-updates base into t/girocco/style-updates