Squashed 'static/' changes from 209cc9c..2963b89

2963b89 edit
2d6a715 edit

git-subtree-dir: static
git-subtree-split: 2963b89f1a4044d586b7d8c4efbb77942890aa53
Merge commit '1aaf0ec994db1bad9803f55a51998e62a0a4215a'