Merged revisions 103690 via svnmerge from