Pull request for issue #1021

Fixes #1021. Generated by conveyor-workflow.