Merged with michi branch at rev 1684fe51cf3d.