Merge remote-tracking branch 'upstream/master' into merge_master_to_2.1.x