am 29c788da: Merge "Workaround for gcc volatile struct member bug"

* commit '29c788da9b75f998c5da8f320cd50351b83a3dff':
  Workaround for gcc volatile struct member bug