Merge remote branch 'origin/master' into freebsd

Conflicts:
	src/x86/Gis_signal_frame.c