Pull request for issue #891

Fixes #891. Generated by conveyor-workflow.