Merge branch 'develop'
Fix download locations
Merge branch 'master' into develop
Prepare for release