[galaxy-commits] commit/galaxy-central: natefoo: Merge 26da838b778c from stable.