Merge branch 'master' into local-hedgehog

From: Dan Tenenbaum (dtenenbaum) <dandante@gmail.com>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/RpacksTesting/gitsvntest0@84725 bc3139a8-67e5-0310-9ffc-ced21a209358