Pull request for issue #1111

Fixes #1111. Generated by conveyor-workflow.