Travis testing
Merge pull request #4542 from GrahamCampbell/4.2-travis

[4.2] Travis Testing