Pull request for issue #1055

Fixes #1055. Generated by conveyor-workflow.