Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-16-01-08-03