Update email address
Bump copyright year
Merge branch '3.7'