Initial import of mpd 0.18