merge test-4.?.x.cfg -> travis.cfg