tgupdate: merge top-bases/t/girocco/style-updates into t/girocco/style-updates