Deadlock analysis commited
new framework fixes
restart option for slr+
Merge remote-tracking branch 'upstream/master'