Pull request for issue #955

Fixes #955. Generated by conveyor-workflow.