Merged revisions 159316 via svnmerge from