Squashed 'static/' changes from 30b199b..0cc32ee

0cc32ee edit

git-subtree-dir: static
git-subtree-split: 0cc32eef27d78111d04091defd8bd5a90cb5c511
Merge commit '17df7aa04cfae24b5c31ff057784d3edeeabb40e'