Merge remote-tracking branch 'origin/4.5' into 4.5-master-2015-02-24-17-24-05