Pull request for issue #813

Fixes #813. Generated by conveyor-workflow.