Fix equality testcase
Merge branch 'master' into travis-osx

* master:
  Fix equality testcase