Merged revisions 141809 via svnmerge from