Merge pull request #179 from adamalex/2.4.0-wip

Run appropriate test strategy for Travis CI