Pull request for issue #1057

Fixes #1057. Generated by conveyor-workflow.