Merged revisions 2647-2719 via svnmerge from