Merge pull request #546 from pusewicz/fix-math-c-generic-dispatch