Removing my email address
Merge branch 'master' into testing