fix lock
Merge branch 'master' into gs

Conflicts:
	tasks/simple_mutex/simple_mutex.o