Fix TXT lookup, add TODO for forwarding TXT queries
Merge branch 'master' into debian