Squashed 'static/' changes from 2d6a715..2963b89

2963b89 edit

git-subtree-dir: static
git-subtree-split: 2963b89f1a4044d586b7d8c4efbb77942890aa53
Merge commit 'cd7617b03a879a28cddda73943d0f5dbb050a37f'
edit