sync
sync
sync
sync
sync
sync
sync
sync
sync
Merge branch 'master' into thib.fixassertwaitok
sync
sync
sync
sync
Merge branch 'master' into thib.fixassertwaitok

Conflicts:
	kern/kern_rwlock.c
Merge branch 'master' into thib.fixassertwaitok