Merged revisions 144924-144925 via svnmerge from