Update to 2.6.30 (mikep2)