Squashed 'static/' changes from 139f2d0..de5b2ed

de5b2ed edit

git-subtree-dir: static
git-subtree-split: de5b2ed06de32002a4005fee7d330ddf1d39751e
Merge commit '2c26ba7f35c72c0b6b9f8512bf7009c415cdfbc1'