Updating for 2.6.1 release