Don't include setjmp.h
Merge branch 'develop' into feature-quality-full

Conflicts:
	config.h.in