Merge in 'recoverjpeg'.