Squashed 'static/' changes from 42f796c..30b199b

30b199b edit

git-subtree-dir: static
git-subtree-split: 30b199b2d23881a8067f04e41319177b8321f68d
Merge commit '8579a09a16d8b439fa1ee8a67678855a5f6cd443'