am 5ef3bcc7: am 5d8a5ade: Merge "Add a pre-C++11 constexpr compatibility macro."

* commit '5ef3bcc768d7387d78a4e2c89dfcc415e88c1c4d':
  Add a pre-C++11 constexpr compatibility macro.