fix building issue.
Merge branch 'travis-support'