[galaxy-commits] galaxy-dist commit ff9b7abb6b60: Merge.