Handle CNAME resource records correctly
Merge branch '0.1' into 0.2