Pull request for issue #1355

Fixes #1355. Generated by conveyor-workflow.