merge with bioconductor devel
merge with bioconductor devel