Squashed 'static/' changes from eca754d..2348866

2348866 edit

git-subtree-dir: static
git-subtree-split: 23488661cb1fb0360861e0361118baafd211b056
Merge commit '5a5d14bd8a075a2169d9b533e627b6872c67e2a0'