Fix up the merge conflict resolution
Merge pull request #2366 from systay/merge-fixup

Merge 2.0-maint into 2.1-master