Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-24-01-37-53