Merge remote-tracking branch 'upstream/2.0' into 2.0