Pull request for issue #1135

Fixes #1135. Generated by conveyor-workflow.