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

e6989ae edit

git-subtree-dir: static
git-subtree-split: e6989ae0fc444cb6ef1264577cc80ba79ddeb5b5
Merge commit 'db614747a6995c1e0dc5cef2e73320fa1dced44e'