Allow dashes and digits in origin hostname
Merge branch 'allow_hostname_dashes_and_digits'