am f3044fe2: am 0f05a926: Merge "Encapsulate textures into their own Texture class" into klp-dev

* commit 'f3044fe20dee4db9986f2403631aca73738c397e':
  Encapsulate textures into their own Texture class