Pull request for issue #1051

Fixes #1051. Generated by conveyor-workflow.