Merge "Remove Atlas parameter for TextureManager cache system" into devel/master