Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-16-17-24-33