Merge branch 'maint-1.6.2' into maint