Merge branch 'PHP-7.0' into PHP-7.1

author Andrea Faulds <ajf@ajf.me>

Sat, 12 Aug 2017 00:37:47 +0000 (01:37 +0100)

committer Andrea Faulds <ajf@ajf.me>

Sat, 12 Aug 2017 00:37:47 +0000 (01:37 +0100)
author Andrea Faulds <ajf@ajf.me>
Sat, 12 Aug 2017 00:37:47 +0000 (01:37 +0100)
committer Andrea Faulds <ajf@ajf.me>
Sat, 12 Aug 2017 00:37:47 +0000 (01:37 +0100)
diff --cc NEWS
Simple merge
diff --cc main/main.c
Simple merge
author	Andrea Faulds <ajf@ajf.me>
	Sat, 12 Aug 2017 00:37:47 +0000 (01:37 +0100)
committer	Andrea Faulds <ajf@ajf.me>
	Sat, 12 Aug 2017 00:37:47 +0000 (01:37 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
main/main.c	patch \|	diff1 \|	diff2 \|	blob \| history