Merge from svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk into jb-mr1