Pull request for issue #1065

Fixes #1065. Generated by conveyor-workflow.