am 962c9f05: Merge "Small cleanup"

* commit '962c9f059a11a128a5547c877d4af485af0019b4':
  Small cleanup