am ebcbe893: Merge "Change e-mail address"

* commit 'ebcbe893f9d6a3b8d1070620ae18f1f4d352eaed':
  Change e-mail address