Version history 2.6.1.0
Merge 2.6.1.0 to master