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

Conflicts:
	src/trackinfoobject.h
	src/widget/wlibrary.h