Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-12-10-27-52