Merge branch 7.x-4.4 into 7.x-4.5