Fix test that seems to fail every once in a while
Merged Pull Request #486

* pull-request/486:
  Fix test that seems to fail every once in a while
Merge branch 'v1.4'

* v1.4:
  Fix test that seems to fail every once in a while