merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/QUALIFIER@74437 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit 'a679edc71265039451ec90ff8575f5b9ae4954fd' into trunk
bump version