Merged revisions 143903 via svnmerge from