Merged revisions 1675-1736 via svnmerge from