Pull request for issue #1171

Fixes #1171. Generated by conveyor-workflow.