Merged revisions 53532 via svnmerge from