Pull request for issue #821

Fixes #821. Generated by conveyor-workflow.