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

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