[galaxy-commits] [galaxyproject/galaxy] b79474: Merge pull request #2206 from dannon/master