Merge remote-tracking branch 'origin/master' into borui

Conflicts:
	src/threads/thread.c