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

4083fd7 edit

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