Add an option for easily avoiding deadlocks in matrix use (#767)

Add an option for easily avoiding deadlocks in matrix use (#767) #28