Pull request for issue #805

Fixes #805. Generated by conveyor-workflow.