Update email address
Merge branch '1.2'