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