Pull request for issue #1033

Fixes #1033. Generated by conveyor-workflow.