Squashed 'static/' changes from f3b3366..a410ffc

a410ffc edit

git-subtree-dir: static
git-subtree-split: a410ffc96195b1b7bd90ae3ddf005dfd41057b43
Merge commit '708f0800e677e17078b3cf3ffe46dfc16566ee01'