Merge branch 'PHP-7.0' into PHP-7.1
authorFerenc Kovacs <tyra3l@gmail.com>
Thu, 27 Oct 2016 21:40:41 +0000 (23:40 +0200)
committerFerenc Kovacs <tyra3l@gmail.com>
Thu, 27 Oct 2016 21:40:41 +0000 (23:40 +0200)

Trivial merge