Merge pull request #526 from hunner/fix_travis