Pull request for issue #807

Fixes #807. Generated by conveyor-workflow.