Squashed 'static/' changes from c06c4c5..cdc2dd4

cdc2dd4 edit

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