Merge branch 4.5 into master