upgraded to 6.1.0
Merge branch '6.1.0'