Master merge of ofTexture changes - compatible with oF 0.8.4