Louis Dionne: A system for resource deadlock prevention
merge Louis Dionne's changes
Fix merge error with Bart Janssens slide.