Squashed 'static/' changes from 29dcae3..e6fca40

e6fca40 edit

git-subtree-dir: static
git-subtree-split: e6fca409a385baba8b35397064cd84a7daa331d1
Merge commit 'fcc1ffe30205cb1623c5aeca1fab0b0697a80f5a'