Fix deadlock: take locks for the minimum tme possible
Merge branch 'workshop' of https://github.com/MrKepzie/Natron into workshop