Merged revisions 53399 via svnmerge from