Updated to rev 7834.