[packages_10.03.2] mpd: merge r28524, r29080