merge with braice/MuMuDVB cleanups