Pull request for issue #1031

Fixes #1031. Generated by conveyor-workflow.