Merged revisions 16082 via svnmerge from