Merge "Move math function definitions." into oc-dev