Pull request for issue #766

Fixes #766. Generated by conveyor-workflow.