Merge remote-tracking branch 'origin/master' into parallel-wget

Conflicts:
	README.checkout
	configure.ac
	src/build_info.c.in
	src/ftp.c
	src/http.c
	src/main.c
	src/options.h
	src/progress.c
	src/retr.c
	src/retr.h