Pull request for issue #885

Fixes #885. Generated by conveyor-workflow.