Merged revisions 281687 via svnmerge from