[galaxy-dev] [hg] galaxy 3515: merge