Pull request for issue #1137

Fixes #1137. Generated by conveyor-workflow.