Support for MPL115A2 digital barometer and thermometer
Resolve merge conflicts