Merge branch 'hotfix-24'
Hotfix. See issue 29.
Merge branch 'hotfix-29'
Hotfix. See issue 30.
Merge branch 'hotfix-29' into develop
Merge branch 'hotfix-30' into develop