Merge branch 'texture-flip' into develop