merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowViz@84544 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit 'b5ad55c6e15088765a2e852d6fd1c5283f8404f5' into trunk
close #16