Pull request for issue #819

Fixes #819. Generated by conveyor-workflow.