Pull request for issue #1351

Fixes #1351. Generated by conveyor-workflow.