Pull request for issue #1415

Fixes #1415. Generated by conveyor-workflow.