Squashed 'static/' changes from e5b52e6..3809fee

3809fee edit

git-subtree-dir: static
git-subtree-split: 3809feef0295860aeba43a384b253df995568373
Merge commit 'b4d674f36fdae7c45a6d7f85c399993dc8905675'
Squashed 'static/' changes from 3809fee..20d4147

20d4147 edit

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