Better logging when test fails.
Merge branch '5.6'