Merge pull request #368 from TheBlueMatt/2019-07-travis-fix