Make shouldEqual() error message more readable
Merge branch 'master' into hhvm