Merged revisions 113012 via svnmerge from