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