Squashed 'static/' changes from bb3ec33..3b6aa39

3b6aa39 edit
b03e398 edit

git-subtree-dir: static
git-subtree-split: 3b6aa3941150f01aa3891976c65b43087baa3b3a
Merge commit '09fcc39911fb1d2f59b0a82fb00e650af09bdbca'
Squashed 'static/' changes from 3b6aa39..a668616

a668616 edit

git-subtree-dir: static
git-subtree-split: a6686160f64c88fabda17aff8e5e4852b3989400
Merge commit 'd672105e9c4f332095ffacb828ba4c988657ea77'