[ESS] ess-roxy-update-entry is wreaking havoc in devel

[Brian]

Dear developers,
ess-roxy-update-entry is wreaking havoc
C-c C-o C-o within
test <- function(crap, crap.parameter)
{
    paste(crap, crap.parameter, sep=" + ")
}
## random text

Gives me:
##'
##'
##'
##' @param crap
##' @param crap.parameter t
##' @return
##' @examples
##' @export est <- function(crap, crap.parameter) { paste(crap,
crap.parameter, sep=" + ") } ## random text

It looks like a bit of text mauling plus auto-fill-mode.  I got bitten
(again) by using melpa.  What am I, a lowly emacs+ess user, doing using
a development release? 

Cheers,
Brian

Problematic:
GNU Emacs 24.5.1 (x86_64-unknown-linux-gnu, X toolkit, Xaw scroll bars)
of 2015-06-23
ess-version: 15.09-devel [elpa: 20150727.1221]

Works as expected:
GNU Emacs 24.4.1 (x86_64-unknown-linux-gnu, GTK+ Version 2.18.9) of
2015-03-05
ess-version: 14.09 [svn: 6041 (2014-09-13)]

<mailto:ess-help at r-project.org>