Pull request for issue #1071

Fixes #1071. Generated by conveyor-workflow.