Squashed 'static/' changes from 9ef8837..a6fb83c

a6fb83c edit

git-subtree-dir: static
git-subtree-split: a6fb83c257faf5d71b7276319b740ba46bfe96f5
Merge commit 'e7a793be0f8358fbaa15cb2c43219c91b78cfa05'