1.6.1 release
Merge branch '1.6.1.release'