Squashed 'static/' changes from a410ffc..ede1b9a

ede1b9a edit

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