Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -11,6 +11,7 @@ php:
   - "5.4"
   - "5.3"
   - hhvm
+  - nightly
 
 sudo: false
 
@@ -59,6 +60,8 @@ matrix:
       env: PHPUNIT_ARGS="--group selenium" SELENIUM="yes"
     - php: hhvm
       env: PHPUNIT_ARGS="--exclude-group selenium"
+    - php: nightly
+      env: PHPUNIT_ARGS="--exclude-group selenium"
   fast_finish: true
   include:
     - php: 5.6

test/install-runkit

@@ -6,7 +6,7 @@ git clone --depth=1 git://github.com/zenovich/runkit.git
 
 pushd runkit
 
-if [ $TRAVIS_PHP_VERSION = "5.6" ] ; then
+if [ $TRAVIS_PHP_VERSION = "5.6" -o $TRAVIS_PHP_VERSION = "nightly" ] ; then
     wget https://github.com/zenovich/runkit/pull/73.diff
     patch -p1 < 73.diff
 fi