Squashed 'static/' changes from 05ee338..19c60c3

19c60c3 edit

git-subtree-dir: static
git-subtree-split: 19c60c3b9da03e022a9534b7857a00a50aa0e32b
Merge commit 'bdfa0e9b0b4c498c86e0bce9078154a6abbc5eb1'