Merge branch 2.4
Update libjpeg to "Version 9  13-Jan-2013"