Merged revisions 34159-34160 via svnmerge from