Pull request for issue #1123

Fixes #1123. Generated by conveyor-workflow.