Pull request for issue #1211

Fixes #1211. Generated by conveyor-workflow.