Pull request for issue #1157

Fixes #1157. Generated by conveyor-workflow.