Pull request for issue #1119

Fixes #1119. Generated by conveyor-workflow.