Pull request for issue #831

Fixes #831. Generated by conveyor-workflow.