Pull request for issue #859

Fixes #859. Generated by conveyor-workflow.