Squashed 'static/' changes from c208e49..188be92

188be92 edit

git-subtree-dir: static
git-subtree-split: 188be9221eb2943687c8598c06a0b62085c656d2
Merge commit 'cc90e880dc2a02f35ed39daba14860760bb2ebf9'