Pull request for issue #1059

Fixes #1059. Generated by conveyor-workflow.