Fixes #1118. Also some speed improvements for semaphores.
Attach a file by drag & drop or click to upload
