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

62ed9dc edit

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