Added HHVM to .travis.yml
Merge branch 'Nyholm-patch-1' into 3.1

Closes #3292