Pull request for issue #1001

Fixes #1001. Generated by conveyor-workflow.