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