am 0ad14266: Merge "Replace NULL with nullptr"

* commit '0ad14266a71c8579cd6bebcaf42f56fae37c988f':
  Replace NULL with nullptr