Fix download
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #809 from liuchuangww/develop

Fix download