Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Wed, 23 Sep 2015 14:02:04 +0000 (07:02 -0700)
committerXinchen Hui <laruence@gmail.com>
Wed, 23 Sep 2015 14:02:04 +0000 (07:02 -0700)

Trivial merge