Don't use shortened download links
Merge branch 'develop'