merge from Mpdreamz, take 2