Squashed 'static/' changes from cdc2dd4..1eafb39

1eafb39 edit

git-subtree-dir: static
git-subtree-split: 1eafb39b8938f5a410235bbdf412d8b691ebc62a
Merge commit '622b7b1695e7564f7362cae6d909dce11f82c668'