Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-04-15-16-31