Email patch
Automatic merging of dev into master

* dev:
  Email patch