Updated to 2.6.0.Final