Merge branch 'master' into mm_rewrite