Pull request for issue #1161

Fixes #1161. Generated by conveyor-workflow.