am 71a14420: Merge "Fix obvious bug"

* commit '71a14420d815824605ffc04b47b97386848d31b3':
  Fix obvious bug