Squashed 'static/' changes from fe6737d..15060e2

15060e2 edit

git-subtree-dir: static
git-subtree-split: 15060e2ad192a5ad831a4e6d8666a6b383faf6ef
Merge commit '52df796ed89b299e5bf80161ff3f511f374036a0'