sage

64eaf5a6 - Merge remote-tracking branch 'upstream/develop' into imagemagick-warning