Merge branch 'more-validations' origin/master
authorMichael Wallner <mike@php.net>
Tue, 16 Feb 2016 15:06:30 +0000 (16:06 +0100)
committerMichael Wallner <mike@php.net>
Tue, 16 Feb 2016 15:06:30 +0000 (16:06 +0100)

Trivial merge