Make random test failure error message more explicit
Merge branch 'master' into 5.6.0