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