Squashed 'static/' changes from c0555bc..79aa5c3

79aa5c3 edit

git-subtree-dir: static
git-subtree-split: 79aa5c38a340d4130c6ab8d68d5c4b9c6f5a8da1
Merge commit '8809f4e731a1a08f104bc39da9e9c022d95f5661'
edit