Nexus 2.6 updates

preparing for nexus 2.6 related release