Squashed 'static/' changes from 015bf0d..4337bf3

4337bf3 edit

git-subtree-dir: static
git-subtree-split: 4337bf3dfffd8f8f90e53392252fe63920842972
Merge commit 'b00854dec576dc95b2d8da90a0b27a01c4b90d46'
Squashed 'static/' changes from 4337bf3..e5b52e6

e5b52e6 edit

git-subtree-dir: static
git-subtree-split: e5b52e65f5a358dc07f72279cefcbf22cbda15f6
Merge commit 'b825cfe81f516caee36dc565c60767fdc1eff69d'