Merge branch 'remotes/jsbackus/mpd_lua52'