Merge pull request #3307 from rubenk/travis-bionic