valid_localpart -> valid_domainpart, reported by Ashish SHUKLA
Merge branch 'master' into portable