am cf140869: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cf14086910b325be9a76c1df0dfc25dca30c98d5':
  sendbug improvements on email address handling