Pull request for issue #1431

Fixes #1431. Generated by conveyor-workflow.