merge from trunk

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowWorkspace@73824 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit '20d28e4b4bd01f2f0e2b676071b89d2e8d15ca36' into trunk
fixed #64