Merged revisions 141806 via svnmerge from