Merge remote-tracking branch upstream/master into gold

trunk@223196