Squashed 'static/' changes from f3b3366..a410ffc

a410ffc edit

git-subtree-dir: static
git-subtree-split: a410ffc96195b1b7bd90ae3ddf005dfd41057b43
Merge commit 'b8903b3fad0ef6d822016f1db24aa0a64bbc01d2'