Merge branch 'PHP-7.1'

author Anatol Belski <ab@php.net>

Sun, 4 Dec 2016 21:46:23 +0000 (22:46 +0100)

committer Anatol Belski <ab@php.net>

Sun, 4 Dec 2016 21:46:23 +0000 (22:46 +0100)
author Anatol Belski <ab@php.net>
Sun, 4 Dec 2016 21:46:23 +0000 (22:46 +0100)
committer Anatol Belski <ab@php.net>
Sun, 4 Dec 2016 21:46:23 +0000 (22:46 +0100)
diff --cc ext/mysqli/tests/mysqli_expire_password.phpt
Simple merge
author	Anatol Belski <ab@php.net>
	Sun, 4 Dec 2016 21:46:23 +0000 (22:46 +0100)
committer	Anatol Belski <ab@php.net>
	Sun, 4 Dec 2016 21:46:23 +0000 (22:46 +0100)