Restore locking in the signals stuff
Merge commit '59791f0'