Updating for release of 2.6