extract some changes from pull request #504 that seem straight forward and helpful to speed up the travis builds