Merge tag '0.26-rc1' into debian

0.26-rc1

Conflicts:
	Makefile

diff --cc Makefile
index de676a6c676511227c4482fa63c40c3e5e444e23,8989838bd1ed3591df3f67d50ef0e8dab79557d2..e1db41d1ca8cd4bfa2166bafc33e715603b9eb14
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  OS:=$(shell uname | sed 's/[-_].*//')
- CFLAGS := -Wall -O2 $(PYINCLUDE) $(CFLAGS)
 -CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
++CFLAGS := -Wall -O2 -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
  SOEXT:=.so
  
  ifeq ($(OS),CYGWIN)