Fix for 0.9.0 texture issues
Merge branch '0.9.0_fixes'