Merge branch 'hotfix/1.20.1'
Merge branch 'master' of https://github.com/nls-oskari/oskari into develop