Pull request for issue #1127

Fixes #1127. Generated by conveyor-workflow.