(upstream git commit 3868e32b9216e14247e0534061d1d02f3b8ab65d)
Show meaningful error message if MPD_PORT is not a number
(upstream git commit 8dde3944ee1878a7f26dd24bfe5e31f4e72c05b1)
lyrics: fix loading of files with DOS line endings
(upstream git commit dac0d4602f810d8f43e18beefdd43068e40308c3)
window: prevent ncurses from defining macros
(upstream git commit 6b73f0ebe1c05cb2b3b6973662e7b6c95eba4530)