Fix travis build fails.
Merge pull request #5485 from dumganhar/develop

Fix travis build fails.