Pull request for issue #1213

Fixes #1213. Generated by conveyor-workflow.