Merged revisions 4645,4647-4651,4654-4656 via svnmerge from