merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowCore@83630 bc3139a8-67e5-0310-9ffc-ced21a209358
conflicts resolved while setting up Git-SVN bridge

From: Bioconductor Git-SVN Bridge <bioc-sync@bioconductor.org>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowCore@86112 bc3139a8-67e5-0310-9ffc-ced21a209358