Branch trunk to 1.5.x.