Merge "Add missing math functions"