Pull request for issue #875

Fixes #875. Generated by conveyor-workflow.