Pull request for issue #1107

Fixes #1107. Generated by conveyor-workflow.