Pull request for issue #1381

Fixes #1381. Generated by conveyor-workflow.