Hotfix 0.30.1

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