Merge commit '6ce4af8587214865771b3fb6da8ba352b9080056' * commit '6ce4af8587214865771b3fb6da8ba352b9080056': refactor copy-and-paste email address filtering code.
Merge commit '6ce4af8587214865771b3fb6da8ba352b9080056' * commit '6ce4af8587214865771b3fb6da8ba352b9080056': refactor copy-and-paste email address filtering code.