CMake win/unix difference
Перемещена блокировка insert
Merge branch 'master' into spinlock

Conflicts:
	map.h