Pull request for issue #1013

Fixes #1013. Generated by conveyor-workflow.