Merge pull request #2 from ToxicBakery/master

Sync recent changes
Merge branch 'master' into texture_packing