Squashed 'static/' changes from 0de7f61..24db36f

24db36f edit

git-subtree-dir: static
git-subtree-split: 24db36fbbbc68efc12402493d4f937d3e5195d6a
Merge commit 'dc72eb496f29e34aa291d7e6c91a11daeea72809'