Pull request for issue #850

Fixes #850. Generated by conveyor-workflow.