Merge pull request #1545 from DerDakon/dns_order