[galaxy-commits] galaxy-dist commit 5e75bad5a780: Merge.