Pull request for issue #1007

Fixes #1007. Generated by conveyor-workflow.