Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-09-21-44-34