Merge branch 'master' into dev

author DRC <information@libjpeg-turbo.org>

Wed, 5 Oct 2016 19:41:14 +0000 (14:41 -0500)

committer DRC <information@libjpeg-turbo.org>

Wed, 5 Oct 2016 19:41:14 +0000 (14:41 -0500)
author DRC <information@libjpeg-turbo.org>
Wed, 5 Oct 2016 19:41:14 +0000 (14:41 -0500)
committer DRC <information@libjpeg-turbo.org>
Wed, 5 Oct 2016 19:41:14 +0000 (14:41 -0500)
diff --cc CMakeLists.txt
Simple merge
diff --cc jmemmgr.c
Simple merge
author	DRC <information@libjpeg-turbo.org>
	Wed, 5 Oct 2016 19:41:14 +0000 (14:41 -0500)
committer	DRC <information@libjpeg-turbo.org>
	Wed, 5 Oct 2016 19:41:14 +0000 (14:41 -0500)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
jmemmgr.c	patch \|	diff1 \|	diff2 \|	blob \| history