Merge remote-tracking branch 'origin/master' into xri-refactor

Runtime/Assets_v1/Scripts/HPUI/Core/ButtonZone.cs

@@ -72,7 +72,7 @@ void OnTriggerEnter(Collider other)
 	{
             if (makeSureEnterFromPositiveSide && other.GetComponent<ButtonTriggerCollider>() != null)
             {
-                enteredOnPositiveSide = new Plane(this.transform.forward, selfPosition).GetSide(other.transform.position);
+                enteredOnPositiveSide = new Plane(this.transform.forward, this.transform.position).GetSide(other.transform.position);
             }
 	    TriggerBehaviour(other);
 	}