Pull request for issue #981

Fixes #981. Generated by conveyor-workflow.