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

015bf0d edit
669774a edit

git-subtree-dir: static
git-subtree-split: 015bf0de377cd87754395659d8073fc759c1194c
Merge commit '126af35ad50e323170b6d2ae27a85da05bc52985'