Merge remote-tracking branch 'upstream/master' into merge_1_0_0