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