Pull request for issue #873

Fixes #873. Generated by conveyor-workflow.