Merge branch 'master' into 84b2bbf
Working on mipmapping
Merge remote-tracking branch 'origin/84b2bbf'