Squashed 'static/' changes from 720089e..58a197c

58a197c edit
d62841e edit
e7093da edit
6ba0319 edit

git-subtree-dir: static
git-subtree-split: 58a197c79d70be76014f0eb73f69a386e6ac8843
Merge commit 'ed337ca80555135f5b962e927e26c7e9e44203ae'