Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-14-11-16-10