Merge branch 'PHP-7.1' into PHP-7.2

author krakjoe <krakjoe@php.net>

Wed, 22 Nov 2017 04:32:24 +0000 (04:32 +0000)

committer krakjoe <krakjoe@php.net>

Wed, 22 Nov 2017 04:32:42 +0000 (04:32 +0000)
author krakjoe <krakjoe@php.net>
Wed, 22 Nov 2017 04:32:24 +0000 (04:32 +0000)
committer krakjoe <krakjoe@php.net>
Wed, 22 Nov 2017 04:32:42 +0000 (04:32 +0000)
diff --cc NEWS
Simple merge
diff --cc ext/standard/random.c
Simple merge
author	krakjoe <krakjoe@php.net>
	Wed, 22 Nov 2017 04:32:24 +0000 (04:32 +0000)
committer	krakjoe <krakjoe@php.net>
	Wed, 22 Nov 2017 04:32:42 +0000 (04:32 +0000)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/random.c	patch \|	diff1 \|	diff2 \|	blob \| history