Merge branch 'PHP-7.0'
authorChristopher Jones <christopher.jones@oracle.com>
Wed, 25 Nov 2015 19:53:54 +0000 (06:53 +1100)
committerChristopher Jones <christopher.jones@oracle.com>
Wed, 25 Nov 2015 19:53:54 +0000 (06:53 +1100)

Trivial merge