merging changes going into bioc-devel