Pull request for issue #1515

Fixes #1515. Generated by conveyor-workflow.