Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-11-04-54