Supervisor no longer brutal kills.
Merge branch 'test' into dev