Pull request for issue #1359

Fixes #1359. Generated by conveyor-workflow.