am 48d7489e: Merge "Fix build with clang"

* commit '48d7489e855df4126aee962087d3adaa763b26fe':
  Fix build with clang