Pull request for issue #1047

Fixes #1047. Generated by conveyor-workflow.