[galaxy-commits] galaxy-dist commit 99a343791645: merge