Squashed 'static/' changes from e6989ae..d9566ae

d9566ae edit

git-subtree-dir: static
git-subtree-split: d9566ae308c81f2cd4b5f286371132bbd53270fe
Merge commit '7b110dd221f8228e0056bcb8c74599da8cf48070'
Squashed 'static/' changes from d9566ae..47e7595

47e7595 edit

git-subtree-dir: static
git-subtree-split: 47e759547c31d1409d3aa87bb7ee5de0e578164b
Merge commit '1d609b6aa173b7220b0040c90643649884b5527a'