Merge "Fix a texture manager crash" into devel/master