Pull request for issue #1503

Fixes #1503. Generated by conveyor-workflow.