Merge remote-tracking branch 'serge/master' into devel

Conflicts:
	pythran/pythran.h
	pythran/toolchain.py