Squashed 'static/' changes from c06c4c5..cdc2dd4

cdc2dd4 edit

git-subtree-dir: static
git-subtree-split: cdc2dd44dcdfd32437f4331265a2d913197dc971
Merge commit 'dc8c1d3291234181e41cce46270d60e72798ffb4'