[galaxy-commits] commit/galaxy-central: martenson: Merged in jmchilton/galaxy-central-fork-1/stable (pull request #620)