Pull request for issue #1101

Fixes #1101. Generated by conveyor-workflow.