Squashed 'global/' changes from a0de8e4..a8311d6

a8311d6 More formatting tweaks

git-subtree-dir: global
git-subtree-split: a8311d61078f086c033974f7804a5f26646a4760
Merge commit 'dbb6ff29a55a1d9a8c15e1321d67884521d45d0f'