Merge pull request #19269 from tchaikov/wip-pr-19202-luminous

author Yuri Weinstein <yuri.weinstein@gmail.com>

Thu, 1 Feb 2018 23:09:29 +0000 (15:09 -0800)

committer GitHub <noreply@github.com>

Thu, 1 Feb 2018 23:09:29 +0000 (15:09 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Thu, 1 Feb 2018 23:09:29 +0000 (15:09 -0800)
committer GitHub <noreply@github.com>
Thu, 1 Feb 2018 23:09:29 +0000 (15:09 -0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/include/config-h.in.cmake
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Thu, 1 Feb 2018 23:09:29 +0000 (15:09 -0800)
committer	GitHub <noreply@github.com>
	Thu, 1 Feb 2018 23:09:29 +0000 (15:09 -0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/config-h.in.cmake	patch \|	diff1 \|	diff2 \|	blob \| history