Merge pull request #17983 from Windfisch:Windfisch-patch-jpeg2000
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Fri, 31 Jul 2020 09:07:35 +0000 (09:07 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Fri, 31 Jul 2020 09:07:35 +0000 (09:07 +0000)

Trivial merge