[galaxy-commits] [hg] galaxy 3721: merge