Squashed 'static/' changes from 58a197c..015bf0d

015bf0d edit
669774a edit

git-subtree-dir: static
git-subtree-split: 015bf0de377cd87754395659d8073fc759c1194c
Merge commit '8b339895e8cfa4aa2aeaddab5f603900b8227cec'