Merged revisions 231614 via svnmerge from