Squashed 'static/' changes from 55c3909..47bbf1e

47bbf1e edit

git-subtree-dir: static
git-subtree-split: 47bbf1e132aaafb53cb9cd58c2d78d13a533895c
Merge commit '343e95c3f391fcf052aac5604bf6d45f73f67a22'