Squashed 'static/' changes from 7236333..8189ef3

8189ef3 edit

git-subtree-dir: static
git-subtree-split: 8189ef3681e1dc8146fce5c4695b891d388cbb5f
Merge commit 'da3c186a11e821cb8120b7599819d36e55b53b79'