[galaxy-commits] galaxy-dist commit ab48c0e20a94: Merge with 0736d9af9e6e7facef8fad93baa3a303e0cf9526