am e3b5cb50: Merge "Workaround apparent clang compilation issue"

* commit 'e3b5cb502371aff7e7b7291facfc27b092e7803e':
  Workaround apparent clang compilation issue