Merge branch 'rewrite-trunks' into merge-trunks