Pull request for issue #895

Fixes #895. Generated by conveyor-workflow.