Merge "Forget the name of a texture after freeing Bug #6408362" into jb-dev