add helper script for restoring Travis error logs
Merge branch '2.3.x' into 2.4.x
Merge branch '2.4.x'