Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-21-13-15-18