Pull request for issue #780

Fixes #780. Generated by conveyor-workflow.