[galaxy-dev] [hg] galaxy 1511: Merge local heads