Squashed 'static/' changes from ebe1099..dd25958

dd25958 edit

git-subtree-dir: static
git-subtree-split: dd259587b1cce79189b7ca8d4ee6e468e7f5027e
Merge commit 'f949cbf6b8fb2622d1c013116230558aa42f4721'
Squashed 'static/' changes from dd25958..d93495b

d93495b edit

git-subtree-dir: static
git-subtree-split: d93495b7c6995b0e9047561ee56494b86fb6e246
Merge commit '5930b9e276c2b9e294693eea17072bccb1a48a83'