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

* commit '8677345e5454d5ead84fc872196561e60cc82136':
  Change e-mail address