Tiny warning fix in, CMPixelFormatType cannot be nil
Merge remote-tracking branch 'origin/master'
Cross platform updates