Merged revisions 131357 via svnmerge from