Pull request for issue #865

Fixes #865. Generated by conveyor-workflow.