Squashed 'global/' changes from a8311d6..9e3b712

9e3b712 More formatting tweaks

git-subtree-dir: global
git-subtree-split: 9e3b712ee1ae089d0ccd06f42ee9059f6e11cb9f
Merge commit 'e84dd262305118420eb3431df4c2ea882d6bf935'