Merged revisions 101818 via svnmerge from