Squashed 'static/' changes from 62ed9dc..a1e98f1

a1e98f1 edit

git-subtree-dir: static
git-subtree-split: a1e98f102ae1def2c2c35ef366ca308895f14cbb
Merge commit '46e4aff073c15d817261c3829efb960e78bd0d3b'