Pull request for issue #1039

Fixes #1039. Generated by conveyor-workflow.