Merge "Clean up some mathematical constants" into release-4-6