Pull request for issue #855

Fixes #855. Generated by conveyor-workflow.