update email
Merge remote-tracking branch 'upstream/master' into i2c-dev