Merge branch 'PHP-7.1' into PHP-7.2

author Nikita Popov <nikita.ppv@gmail.com>

Sat, 26 May 2018 20:06:44 +0000 (22:06 +0200)

committer Nikita Popov <nikita.ppv@gmail.com>

Sat, 26 May 2018 20:06:44 +0000 (22:06 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Sat, 26 May 2018 20:06:44 +0000 (22:06 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Sat, 26 May 2018 20:06:44 +0000 (22:06 +0200)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Sat, 26 May 2018 20:06:44 +0000 (22:06 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Sat, 26 May 2018 20:06:44 +0000 (22:06 +0200)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history