Pull request for issue #979

Fixes #979. Generated by conveyor-workflow.