Squashed 'static/' changes from 24db36f..e8ba84d

e8ba84d edit

git-subtree-dir: static
git-subtree-split: e8ba84deb9fe5972cfa55203fb237cc971ddc10b
Merge commit '9af2007dd5ae2c0dbf753c213386b7b4dcbb63ae'