am d292d2a0: Merge 36a3a392 from mr1.

* commit 'd292d2a03134eaca8b51b6313610b4b78de53c83':
  Merge 36a3a392 from mr1.