Hotfix 0.30.1

Created to fix #70.
Merge targets:
* [x] master
* [x] develop
* [x] release-0.31.0