[galaxy-commits] commit/galaxy-central: natefoo: Merged in martenson/galaxy-merging/next-stable (pull request #504)