Pull request for issue #1029

Fixes #1029. Generated by conveyor-workflow.