Merged revisions 240-245 via svnmerge from