Merge pull request #7787 from diizzyy/libmpdclient