Pull request for issue #1173

Fixes #1173. Generated by conveyor-workflow.