Squashed 'static/' changes from ede1b9a..d2ec7ec

d2ec7ec edit

git-subtree-dir: static
git-subtree-split: d2ec7ec06d4c268eb3a853ff780312f51ee84482
Merge commit '7c1391b148ed0d664580c23a7517fee3088578e9'