Merged revisions 1582-1665 via svnmerge from