Pull request for issue #877

Fixes #877. Generated by conveyor-workflow.