Pull request for issue #1141

Fixes #1141. Generated by conveyor-workflow.