Squashed 'static/' changes from d2ec7ec..bb3ec33

bb3ec33 edit

git-subtree-dir: static
git-subtree-split: bb3ec339b48460959dbfbb3c6dfa191464cff71f
Merge commit '5464b9235f6b086fe430893032bcba625d147533'