Merge remote-tracking branch 'upstream/master' into test-merge

# Conflicts:
#	common/Makefile.am
#	common/socket.c
#	src/Makefile.am

Update NEWS with latest changes

2.0.1 release

2.0.0 release

Update NEWS with latest changes

1.0.9 release