Merge "Fix breakage from giflib update"