Squashed 'static/' changes from a410ffc..ede1b9a

ede1b9a edit

git-subtree-dir: static
git-subtree-split: ede1b9ab6046838fe8dfe2ed0e47fd6133ea9811
Merge commit 'ab49c1e27a6f141a95e9e1a602a273a608e889cf'