Pull request for issue #1081

Fixes #1081. Generated by conveyor-workflow.