Squashed 'static/' changes from a6fb83c..fe6737d

fe6737d edit

git-subtree-dir: static
git-subtree-split: fe6737d0102d06e1d083485924d5d42282d06c12
Merge commit '1a4ebd98e2858caaee46540087ee219e49c01e26'