am 588d7b8d: am 1c12b44c: (-s ours) am e9b4f50e: am 386c576a: am e534b0e8: am...

am 588d7b8d: am 1c12b44c: (-s ours) am e9b4f50e: am 386c576a: am e534b0e8: am 00880781: am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT

* commit '588d7b8d':
  DO NOT MERGE Fail more gracefully on allocation failure