some update
Merge remote-tracking branch 'origin'

Conflicts:
	os/linux.org
	os/windows.org