fix for bug #4485
Merge branch 'hotfix/0.9.6'