Fix a build error on travis
Merge branch 'travis'