Merge branches 'line-buffer', 'text-request', 'timeout' and 'refactor-manager'
Merge branch 'master' into next
Merge branch 'proper-types' into next

Conflicts:
	src/MPD/Internal.hs
Merge branch 'next' into pu

Conflicts:
	src/MPD/Internal.hs