am 60ba211d: Merge "Fix build: __unused isn\'t unused!"

* commit '60ba211d2b1b4205063419b0933cba711b1547d6':
  Fix build: __unused isn't unused!