Travis CI build improvement: output test errors to stdout as text when build fails
Merge branch '2.3.x' into 2.4.x
Merge branch '2.4.x' into 2.5.x
Merge branch '2.5.x'

Conflicts:
	travis-after-failure.sh