fixes #530
Merge branch 'hotfixes' into stable