Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-16-17-51-20