Pull request for issue #893

Fixes #893. Generated by conveyor-workflow.