Squashed 'static/' changes from 47bbf1e..4aec069

4aec069 edit
188be92 edit
c208e49 edit

git-subtree-dir: static
git-subtree-split: 4aec0692c9061e855abbdbbbc096ebf18b475c27
Merge commit '3a6abed2c97f1fa232faa824b516271845f757b2'