Squashed 'static/' changes from 4083fd7..f330c54

f330c54 edit
50864e0 edit

git-subtree-dir: static
git-subtree-split: f330c5413ca894801344160944b3dbf7fa550dd1
Merge commit '28657d7ecfafe246f154d32d7d9ad92e1e01792b'