Squashed 'static/' changes from 4083fd7..50864e0

50864e0 edit

git-subtree-dir: static
git-subtree-split: 50864e0fad857a4a73d3ba7cbb8c7b45016779fd
Merge commit 'fce1b57872cb3bb30aae303773bc912e9d97092d'
Squashed 'static/' changes from 50864e0..f330c54

f330c54 edit

git-subtree-dir: static
git-subtree-split: f330c5413ca894801344160944b3dbf7fa550dd1
Merge commit '656af98d6dd113ecc4dd7b5148cd20e37945699e'