Merge branch 'maint-1.8.3' into maint