Domain mapping & multi domains sunrise

Hello.

sunrise.php is different in the domain mapping and multi domains plugin.

I just updated the multi domains plugin today and mapped domains stopped working. I then replaced sunrise.php with the version from domain mapping and they worked again. Multi-domains seems to be working as well, except the root domains. If someone goes to domain2.com they are directed to domain1.com/wp-signup.php?new=domain2.com

Did anyone else have this problem? Everything seems to work now, with the sunrise.php from the domain mapping plugin, except the above.