Merged revisions 143736 via svnmerge from