Merge remote-tracking branch 'upstream/2.1'