sync with seajs master