Pull request for issue #983

Fixes #983. Generated by conveyor-workflow.