Squashed 'static/' changes from 242496b..e9a197a

e9a197a edit

git-subtree-dir: static
git-subtree-split: e9a197a0fea53a3a5d1056118179b423f685b691
Merge commit '20926f49dbcb61e0ae5b26a1153b1898ffb3dd07'
Squashed 'static/' changes from e9a197a..ef6b13d

ef6b13d edit

git-subtree-dir: static
git-subtree-split: ef6b13de4cd08ef4645b431c6b4cf3374f1fcec6
Merge commit 'a15bc9fb20b2f6b7953188af4094b9ace8d35847'