Squashed 'static/' changes from e5b52e6..20d4147

20d4147 edit
3809fee edit

git-subtree-dir: static
git-subtree-split: 20d414776f3f6eab34e54fa0fcccd1aa805f221a
Merge commit 'd6f062820f86cf92daeb61e67689a3583b96dff3'