Fix Travis timeout.
Merge remote-tracking branch 'staging/develop' into develop
Merge pull request #126 from eric-wu/develop

Fix Travis timeout