35bff86 Merge branch 'release/v1.6.0'