From: Antonin Descampe <antonin@gmail.com>
Date: Sat, 14 May 2016 23:11:44 +0000 (+0200)
Subject: Merge branch 'master' into openjpeg-2.1
X-Git-Tag: v2.1.1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9466d3100e8fe7fd2605d6f39895f9abd7358268;p=openjpeg

Merge branch 'master' into openjpeg-2.1
---

9466d3100e8fe7fd2605d6f39895f9abd7358268