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

242496b edit

git-subtree-dir: static
git-subtree-split: 242496bfb40c569c0b8383bf110572d45c20b6eb
Merge commit '439ac1e00ce55b3abe8d38b0cd84bee1af7d0182'