Squashed 'static/' changes from bdb3107..7236333

7236333 edit

git-subtree-dir: static
git-subtree-split: 72363338e778e1d5ed31098e0c49d5b6c408185e
Merge commit '5d014a241dd7365fb74bdb935940e760952ec135'