Merge branch 'upstream/master' into channel_refactor_2

Conflicts:
	source/common/arch/posix/scheduler.c
	source/common/arch/win/scheduler.c