ngene-octopus-test: Fix download link
Rebuild against new imagemagick
Merge branch 'master' into next

Conflicts:
	plugins/vdr-skinelchi/PKGBUILD
	plugins/vdr-skinflat/PKGBUILD
	plugins/vdr-skinnopacity/PKGBUILD
	plugins/vdr-skinpearlhd/PKGBUILD
	plugins/vdr-text2skin/PKGBUILD
	plugins/vdr-tvguide/PKGBUILD
	plugins/vdr-yaepghd/PKGBUILD