Pull request for issue #809

Fixes #809. Generated by conveyor-workflow.