am 69b4587b: DO NOT MERGE. may fix build on some version of gcc

* commit '69b4587bfbb3e98f793959d9123340360fa233a2':
  DO NOT MERGE. may fix build on some version of gcc