Squashed 'static/' changes from d400bef..6c6b3ec

6c6b3ec edit

git-subtree-dir: static
git-subtree-split: 6c6b3ecaec952af17f99d86690520481c3d3e5c2
Merge commit 'fd9b89f63548433ef119605c647d218f358d6eac'