[galaxy-commits] galaxy-dist commit e5f90080a2db: Merge with 29157e97e95453c5f9022d9c571527a6de4032e1