Merge pull request #888 from glennsarti/fix-travis