Merge branch 'maint-2.0' into maint-2.1