Squashed 'static/' changes from 1757021..eca754d

eca754d edit

git-subtree-dir: static
git-subtree-split: eca754d6c8e6680262663afd4562258f4f2fa9dc
Merge commit '2523921aee1f6380aa1367a7e40e444773f142ab'