Merge pull request #2169 from MikePetullo/php5
authorJo-Philipp Wich <[email protected]>
Mon, 28 Dec 2015 15:26:52 +0000 (16:26 +0100)
committerJo-Philipp Wich <[email protected]>
Mon, 28 Dec 2015 15:26:52 +0000 (16:26 +0100)
Cherry pick PHP5 updates into for-15.05.


Trivial merge