Merge branch 'i2c', remote-tracking branch 'origin/i2c' into i2c