Pull request for issue #1179

Fixes #1179. Generated by conveyor-workflow.