Merge change 534 into donut

* changes:
  Make sure to map undefined OES functions to their non-OES counterpart if it exists.