Pull request for issue #1369

Fixes #1369. Generated by conveyor-workflow.