Repeated code clause (ignoreip) removed
Plug memory leak from 5be30c9
Merge branch 'master' into maxmind

Conflicts:
	query.c