Handle escaping literal hosts properly
Merge branch 'master' into query-parameters
Test empty keys and values