Merge branch 'rewrite'
Merge branch 'master' into rewrite