Squashed 'static/' changes from 059498b..04fd022

04fd022 edit

git-subtree-dir: static
git-subtree-split: 04fd022e3b5a261a991de5ca2efdad04e27b684e
Merge commit '03a55b32f061d228e6e4c5c6e596bb875d7e283c'