Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-04-13-16-08-08