Pull request for issue #811

Fixes #811. Generated by conveyor-workflow.