Pull request for issue #881

Fixes #881. Generated by conveyor-workflow.