Updates for 2.5.1 becoming 2.6.0