Merged revisions 149130 via svnmerge from