Merge branch '4.6' into master