Merge changes I94b1c31c,Ib0b16c87

* changes:
  Add target to texture
  Use Bitmap in Texture.upload