Add in changes from servetti-polito to add in live mpd support.