Merge branch 'DSM50' into develop

Conflicts:
	cross/sabnzbd/Makefile
	spk/sabnzbd/Makefile