[galaxy-commits] commit/galaxy-central: dannon: Merge back from next-stable.