Squashed 'static/' changes from 209cc9c..2d6a715

2d6a715 edit

git-subtree-dir: static
git-subtree-split: 2d6a7152bd5bf8431aa0ca5bc3d7d3b4cdbd5bf7
Merge commit '6cf068751e86ac374ade318d483b7ddb381df83a'