merge from trunk

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_13/madman/Rpacks/flowWorkspace@86164 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit 'd9335bcb561ea0600de54d65b0adab37b5d4a86c'
close #138
Merge branch 'trunk'
Merge branch 'master' of github.com:RGLab/flowWorkspace