Squashed 'static/' changes from a668616..4083fd7

4083fd7 edit

git-subtree-dir: static
git-subtree-split: 4083fd74ae197a1bb86187edd4e652b7ccc641f3
Merge commit '8e67fa1c6092069d1f46a1c80568acd2aea1dfd3'