Pull request for issue #1069

Fixes #1069. Generated by conveyor-workflow.