Pull request for issue #1167

Fixes #1167. Generated by conveyor-workflow.