Domain name with hyphen breaks hosting alias subdomain

Thought it was related to provision, see my previous issue #2766411: Wrong entry in sites.php for automatic subdomain when URL contains hyphen

When using automatic subdomain hosting, the generated entry in sites.php for the automatic subdomain is broken when a hyphen is present in the site's domain name.

For exemple, creating the site 'test-me.com' with automatic subdomain '.dev' produces the following sites/sites.php:

$sites = array (
  'test--me-com.dev' => 'test-me.com',
  'www.test-me.com' => 'test-me.com',
);

Note the 'test--me-com.dev' which should read 'test-me.com.dev'.

The problem is at line 508 of alias/hosting_alias.module, will try to post a patch later on...