supervisor: 3.0 -> 3.1.3
meld3: Cleanup