Additional patch for es6/google chrome 38. See #522