Merge origin/master

Conflicts:
	src/darwin/hook_thread.c
	src/x11/hook_thread.c