Merge branch 'master' of https://github.com/uclouvain/openjpeg into tier1_optimizatio...