Squashed 'static/' changes from 015bf0d..e5b52e6

e5b52e6 edit
4337bf3 edit

git-subtree-dir: static
git-subtree-split: e5b52e65f5a358dc07f72279cefcbf22cbda15f6
Merge commit '78ebd5b199152c35b87a6b259df547aec87af3ed'