Add imagemagick support for a lot of filetypes
Fix dependencies for sys-upgrade
Merge branch 'master' into g2-pc