Pull request for issue #1079

Fixes #1079. Generated by conveyor-workflow.