Fixes #144
Merge branch 'hotfix-5.3.1'