Update email address
Merge branch 'master' into form-extension