Merge branch 'Texture_loader'