Pull request for issue #778

Fixes #778. Generated by conveyor-workflow.