change email address.
Merge branch 'master' into nix