Merge branch 'master' into dev

author DRC <information@libjpeg-turbo.org>

Mon, 12 Nov 2018 20:40:19 +0000 (14:40 -0600)

committer DRC <information@libjpeg-turbo.org>

Mon, 12 Nov 2018 20:40:19 +0000 (14:40 -0600)
author DRC <information@libjpeg-turbo.org>
Mon, 12 Nov 2018 20:40:19 +0000 (14:40 -0600)
committer DRC <information@libjpeg-turbo.org>
Mon, 12 Nov 2018 20:40:19 +0000 (14:40 -0600)
diff --cc CMakeLists.txt
Simple merge
diff --cc ChangeLog.md
Simple merge
author	DRC <information@libjpeg-turbo.org>
	Mon, 12 Nov 2018 20:40:19 +0000 (14:40 -0600)
committer	DRC <information@libjpeg-turbo.org>
	Mon, 12 Nov 2018 20:40:19 +0000 (14:40 -0600)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
ChangeLog.md	patch \|	diff1 \|	diff2 \|	blob \| history