Merge pull request #1573 from esrrhs/master

fix travis build