Pull request for issue #848

Fixes #848. Generated by conveyor-workflow.