Squashed 'static/' changes from 15060e2..d400bef

d400bef edit

git-subtree-dir: static
git-subtree-split: d400bef75fb203859765e6ec7f51585ff91daec6
Merge commit '62d06d330cdc03f9fa3884ad145d950696cf9147'