Squashed 'static/' changes from 8189ef3..67394d3

67394d3 edit

git-subtree-dir: static
git-subtree-split: 67394d32fe24a1b9204bd6f5958509ab7993ac29
Merge commit '28f8fac4879ed99d2c3df7a75f0a33260492cabc'