Merge branch 'hotfix-56'
Fix bug #57
Merge branch 'hotfix-57' into develop