Pull request for issue #1215

Fixes #1215. Generated by conveyor-workflow.