Merged revisions 14276 via svnmerge from