Merge branch 'hotfix/0.3.5'
Merge branch 'master' into develop
Merge branch 'develop' into wip/spinner