Merge branch 'maint-1.7.6' into maint-1.7.7