am affb4e7: Merge change 534 into donut

Merge commit 'affb4e7694a4184d257d0ac71e3119e015b558e2'

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