Change e-mail address
Merge branch 'master' into new-mm