Pull request for issue #1061

Fixes #1061. Generated by conveyor-workflow.