update email address
pick upstream commit effb0b0