Add Travis-CI build status
Merge branch '2.4.x'