Pull request for issue #1129

Fixes #1129. Generated by conveyor-workflow.