Pull request for issue #1455

Fixes #1455. Generated by conveyor-workflow.