Squashed 'static/' changes from 20d4147..bdb3107

bdb3107 edit

git-subtree-dir: static
git-subtree-split: bdb3107893a3c18221cc45df83696259dc1df15e
Merge commit 'df55e4b5d0e03e206dc1f98a5aa300576d1fd2e4'