Pull request for issue #799

Fixes #799. Generated by conveyor-workflow.