[galaxy-commits] galaxy-dist commit e65936a1fa49: Merge