Merge changes Ib41156d8,Ib92b4e57 into studio-1.3-dev
automerge: 73ce93d

* commit '73ce93d09798c203459a4e8221929cf80bf77627':
  Initialization routines to support alternative GLES implementations.
  Changing the core of the GLES dispatcher into a struct.