Pull request for issue #1139

Fixes #1139. Generated by conveyor-workflow.