Merged revisions 243486 via svnmerge from