Pull request for issue #861

Fixes #861. Generated by conveyor-workflow.