Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-14-11-24-52