Squashed 'static/' changes from 6c6b3ec..ebe1099

ebe1099 edit

git-subtree-dir: static
git-subtree-split: ebe1099692c1cc989ac4438f8a327b11a357d27a
Merge commit '58a7f7de2b3a40abfdd41cca9b7bc37db4d5d714'