Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	doc/config
	doc/ncmpcpp.1
	src/actions.cpp
	src/browser.cpp
	src/media_library.cpp
	src/settings.cpp
	src/settings.h