Relax the RegEx restrictions to allow the new ICAAN TLDs.
Merge remote-tracking branch 'upstream/master'
Adding changelog entry.
Fix conflict for merge PR #726
Merge branch 'jshirley-master'