Fix
Make test portable (HHVM has different error message)
Merge branch '3.8'