Pull request for issue #985

Fixes #985. Generated by conveyor-workflow.