Squashed 'static/' changes from 79aa5c3..a4bd831

a4bd831 edit

git-subtree-dir: static
git-subtree-split: a4bd83171de273d9d581f30cc40bec40c208cb39
Merge commit '4863a7ab74c9e8f715cdf528f815dd093cf822d4'