Merge branch 'dev'
Texture2d => Texture2D
Merge branch 'master' into dev