Pull request for issue #1479

Fixes #1479. Generated by conveyor-workflow.