Pull request for issue #1385

Fixes #1385. Generated by conveyor-workflow.