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

* commit '0f05a926647389551aba6b8cfac37aaf73e8bad8':
  Encapsulate textures into their own Texture class