I2C-0012 - mhuckaby : resolved parent version conflict