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

1eafb39 edit

git-subtree-dir: static
git-subtree-split: 1eafb39b8938f5a410235bbdf412d8b691ebc62a
Merge commit '5ece6c5b4ac163176de1a055a8b5d3632efa8563'