Merge branch 'i2c/for-current' into i2c/for-mergewindow