Squashed 'static/' changes from 04fd022..ef6b13d

ef6b13d edit
e9a197a edit
242496b edit

git-subtree-dir: static
git-subtree-split: ef6b13de4cd08ef4645b431c6b4cf3374f1fcec6
Merge commit '8646b429cb702ac6ec9bd49f9d8284e9b56d36f2'