Squashed 'static/' changes from 2963b89..ab037ba

ab037ba edit

git-subtree-dir: static
git-subtree-split: ab037bab27f41484b5b9e27125fdd477613f3011
Merge commit '3ee289f5c07bbba4547ae1c0b39a54d7aa5c385a'