Merged revisions 340219-340220 via svnmerge from