Pull request for issue #1045

Fixes #1045. Generated by conveyor-workflow.