Merged revisions 143534 via svnmerge from