Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyra3l@gmail.com>
Sun, 3 Jul 2016 21:35:00 +0000 (23:35 +0200)
committerFerenc Kovacs <tyra3l@gmail.com>
Sun, 3 Jul 2016 21:35:00 +0000 (23:35 +0200)

Trivial merge