Merged revisions 179532 via svnmerge from