Prepare 1.6.0 release
Merge release 1.6.0