Update
Merge branch 'email-part4'
Merge branch 'master' into gh-pages