Pull request for issue #1379

Fixes #1379. Generated by conveyor-workflow.