Merge PR #895 into master