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