am baa3e339: am ebcbe893: Merge "Change e-mail address"

* commit 'baa3e339f4b5bd68e1724fbe8fefd807dc2f75db':
  Change e-mail address