Merge branch 'master' of https://github.com/php/php-src
authorJoe Watkins <krakjoe@php.net>
Tue, 1 Sep 2015 10:00:45 +0000 (11:00 +0100)
committerJoe Watkins <krakjoe@php.net>
Tue, 1 Sep 2015 10:00:45 +0000 (11:00 +0100)

Trivial merge