Pull request for issue #1117

Fixes #1117. Generated by conveyor-workflow.