Rebuild against imagemagick 6.8.7.5
Merge branch 'master' into next

Conflicts:
	plugins/vdr-skinnopacity/PKGBUILD
	plugins/vdr-tvguide/PKGBUILD