Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure.ac
	src/Makefile.am
	src/proto/nc_memcache.c
Fix grammar in configure.ac