fix error reported on TravisCI
Merge branch 'fix' into 1.7.x