Merged revisions 131242 via svnmerge from