Fix travis-ci build.
Merge pull request #767 from jharding/travis-fix

fix travis-ci build