Pull request for issue #883

Fixes #883. Generated by conveyor-workflow.