Fix failing Travis builds
Merge pull request #434 from aws/fix-travis-builds

Fix failing Travis builds