Merge 2.0-maint into 2.1-master