From: DRC <information@libjpeg-turbo.org>
Date: Fri, 16 Mar 2018 07:16:41 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.5.90~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4da0750f0d8cc7e5bf2602b5020905575e854cb;p=libjpeg-turbo

Merge branch 'master' into dev
---

a4da0750f0d8cc7e5bf2602b5020905575e854cb