Merge remote-tracking branch 'mfischer/libjpeg' into next