Pull request for issue #1317

Fixes #1317. Generated by conveyor-workflow.