Pull request for issue #853

Fixes #853. Generated by conveyor-workflow.