Merge latest sources from Diaoul/subliminal

Merge subliminal sources until commit 464b7834774e1b49cdd7366c0b3dc08eeff81861