Rebase from 'upstream' (no changes)
Fix -lm library
Rebase from 'upstream'