Pull request for issue #887

Fixes #887. Generated by conveyor-workflow.