Pull request for issue #1537

Fixes #1537. Generated by conveyor-workflow.