Pull request for issue #867

Fixes #867. Generated by conveyor-workflow.