Merged revisions 1667-1674 via svnmerge from