Cut 1.6.1 final
Merge branch '1.6'