Squashed 'static/' changes from d9566ae..47e7595

47e7595 edit

git-subtree-dir: static
git-subtree-split: 47e759547c31d1409d3aa87bb7ee5de0e578164b
Merge commit '4b6a607d45a4dfccd1a226aefd600f910376cefb'