Squashed 'static/' changes from c0555bc..a4bd831

a4bd831 edit
79aa5c3 edit

git-subtree-dir: static
git-subtree-split: a4bd83171de273d9d581f30cc40bec40c208cb39
Merge commit '41e48908e8e22cb9913cb713ed9300bb112ecee6'