Merged revisions 103683 via svnmerge from