Merging hotfix 0.3.1 into develop

Commit `e7fa22a` was in the wrong direction. Should've been merged from `master` into `develop` instead of the other way around.