Pull request for issue #1315

Fixes #1315. Generated by conveyor-workflow.