Pull request for issue #846

Fixes #846. Generated by conveyor-workflow.