[galaxy-commits] [galaxyproject/galaxy] fa80b4: Merge pull request #1 from galaxyproject/dev