Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-11-10-56-09