[galaxy-commits] commit/galaxy-central: martenson: Merged in dannon/galaxy-central/stable (pull request #635)