Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Wed, 30 Sep 2015 02:42:23 +0000 (10:42 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 30 Sep 2015 02:42:23 +0000 (10:42 +0800)

Trivial merge