Squashed 'static/' changes from 4aec069..c0555bc

c0555bc edit

git-subtree-dir: static
git-subtree-split: c0555bcc8270b603b21060d71542f222d257b9e5
Merge commit 'da4d175682ecd692d1acae4859b20283dd062d90'