am 310fcd94: Merge "Add additional math constants"

* commit '310fcd94a0448ae01ccb6ecb127c3ec77c708deb':
  Add additional math constants