Merged revisions 11946 via svnmerge from