Pull request for issue #786

Fixes #786. Generated by conveyor-workflow.