Pull request for issue #1091

Fixes #1091. Generated by conveyor-workflow.