Squashed 'static/' changes from a4bd831..bb7859f

bb7859f edit

git-subtree-dir: static
git-subtree-split: bb7859fdc93d945fba03410f13d4d5545b1789db
Merge commit '9b22280500256ff62d5c66c58b5059dba934e393'