Pull request for issue #871

Fixes #871. Generated by conveyor-workflow.