Pull request for issue #1043

Fixes #1043. Generated by conveyor-workflow.