Squashed 'static/' changes from 535016d..0015d5b

0015d5b edit

git-subtree-dir: static
git-subtree-split: 0015d5b10a4e058091780af570e4c0598205ee74
Merge commit 'e93f32c68486ab0df6f68824ca9294fecbcd872f'