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

139f2d0 edit

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