Pull request for issue #1131

Fixes #1131. Generated by conveyor-workflow.