Merge remote-tracking branch 'author/master'

Conflicts:
	Makefile.in
	configure
option to provide a path to the geoIp database to use (untested)