closes #543
Merge branch 'hotfixes' into stable