Pull request for issue #1163

Fixes #1163. Generated by conveyor-workflow.