Merge branch 'master' into debian

Conflicts:
	Makefile

diff --cc Makefile
index 0f18c43b20a051055db328f50abc71cb04192147,216bf983311fc883eb43d14f7ef22d0012c4087f..c542f9753cab21755cf3eebdfb279bd60653b3d3
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  OS:=$(shell uname | sed 's/[-_].*//')
- CFLAGS:=-Wall -O2 $(PYINCLUDE)
 -CFLAGS := -Wall -O2 -Werror $(PYINCLUDE) $(CFLAGS)
++CFLAGS := -Wall -O2 $(PYINCLUDE) $(CFLAGS)
  SOEXT:=.so
  
  ifeq ($(OS),CYGWIN)

diff --cc config/configure
Simple merge