Squashed 'static/' changes from 19c60c3..139f2d0

139f2d0 edit

git-subtree-dir: static
git-subtree-split: 139f2d035ab0e6c7eea6530694163f79690d3435
Merge commit '8d38a4122bd6a32759ad4f9c110440c36d2af2db'