Merge branch 'PHP-7.1'

author Joe Watkins <krakjoe@php.net>

Thu, 22 Jun 2017 13:01:54 +0000 (14:01 +0100)

committer Joe Watkins <krakjoe@php.net>

Thu, 22 Jun 2017 13:02:09 +0000 (14:02 +0100)
author Joe Watkins <krakjoe@php.net>
Thu, 22 Jun 2017 13:01:54 +0000 (14:01 +0100)
committer Joe Watkins <krakjoe@php.net>
Thu, 22 Jun 2017 13:02:09 +0000 (14:02 +0100)
diff --cc NEWS
Simple merge
diff --cc acinclude.m4
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Thu, 22 Jun 2017 13:01:54 +0000 (14:01 +0100)
committer	Joe Watkins <krakjoe@php.net>
	Thu, 22 Jun 2017 13:02:09 +0000 (14:02 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
acinclude.m4	patch \|	diff1 \|	diff2 \|	blob \| history