Squashed 'static/' changes from d93495b..0de7f61

0de7f61 edit

git-subtree-dir: static
git-subtree-split: 0de7f61e3ad98bee36d5bac64a8de406649be870
Merge commit 'cb0b5228fbe8c7b70d0aa291f097360ce7033926'