Merge branch 'master' into dnssec

diff --cc src/cache.c
Simple merge

diff --cc src/config.h
Simple merge

diff --cc src/dnsmasq.c
Simple merge

diff --cc src/dnsmasq.h
Simple merge

diff --cc src/option.c
Simple merge

diff --cc src/rfc1035.c
Simple merge