Merge branch 'master' into openjpeg-2.1