[galaxy-commits] galaxy-dist commit 71b1a5920fc1: Merge.