Merge pull request #9811 from ja-pa/imagemagic-update