[galaxy-commits] commit/galaxy-central: dannon: Resolve merge across branches.