[galaxy-dev] [hg] galaxy 2684: Merge