Pull request for issue #879

Fixes #879. Generated by conveyor-workflow.