Squashed 'static/' changes from 47e7595..42f796c

42f796c edit

git-subtree-dir: static
git-subtree-split: 42f796cc7d064fe34539c6f98848e903b02b5a23
Merge commit '2680fe79dfed3ad393c02057651822b9c256cf65'