Merged revisions 297157,297486,297495 via svnmerge from