Merged revisions 13748 via svnmerge from