Merge pull request #12289 from neheb/GIF