registration email bcc'ed to admin
Merge branch 'upstream/master'
Merge branch 'master'