Merge branch 'hotfix/0.20.2'
Simplify URLs
Merge branch 'master' into devel