Merge "Add stride to PixelData" into devel/master