Merge "libjpegrecoverymap: bug fix"