Pull request for issue #1371

Fixes #1371. Generated by conveyor-workflow.