Squashed 'static/' changes from 20d4147..bdb3107

bdb3107 edit

git-subtree-dir: static
git-subtree-split: bdb3107893a3c18221cc45df83696259dc1df15e
Merge commit '81ddc7e14b09dcf0848bbb947af25f0912c34f7b'