Squashed 'static/' changes from 0cc32ee..29dcae3

29dcae3 edit

git-subtree-dir: static
git-subtree-split: 29dcae3dd59126896487ea1eafc94c81b686f176
Merge commit 'a6e181d2ff3659b5a39ea1cc598e4f45a1929673'