Squashed 'static/' changes from de5b2ed..1757021

1757021 edit

git-subtree-dir: static
git-subtree-split: 1757021b9b7e9207a87d3c793ad415ceb15ba30b
Merge commit '75f4bf878d4598a306a37735b9d9fca0ed3c268e'