[3rd-party plugins] Update
[3rd-party plugins] Update
[3rd-party plugins] Update
Merge remote-tracking branch 'upstream/2.1' into 2.1