Merged revisions 130173 via svnmerge from