Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-16-12-52-48