Squashed 'static/' changes from e6989ae..d9566ae

d9566ae edit

git-subtree-dir: static
git-subtree-split: d9566ae308c81f2cd4b5f286371132bbd53270fe
Merge commit 'b8a4559c58c8daa72b56bcc17a82bf1252e2d81d'