[galaxy-commits] galaxy-dist commit f6dbbf8922c8: merge