Squashed 'static/' changes from 59a7d16..62ed9dc

62ed9dc edit

git-subtree-dir: static
git-subtree-split: 62ed9dc7dbef3a4dd5ed4713ac9360d785f240e6
Merge commit 'a91bd61a3887b5127957c5db35727ec06c0a9fea'