Pull request for issue #1165

Fixes #1165. Generated by conveyor-workflow.