Merged revisions 14821 via svnmerge from