Squashed 'static/' changes from 0015d5b..1fb4760

1fb4760 edit

git-subtree-dir: static
git-subtree-split: 1fb4760ab6077e0a516ec43565fca6b057dede21
Merge commit 'db519354aa7e3b259ca167c19caa5899984f9edd'