[galaxy-commits] galaxy-dist commit 2875445df990: merge