Pull request for issue #794

Fixes #794. Generated by conveyor-workflow.