Merged revisions 144677 via svnmerge from