Pull request for issue #1175

Fixes #1175. Generated by conveyor-workflow.