Merge 2.1-maint into master