software update 2.6.1
Merge branch '2.6_fix'