Merge branch 'master' into c_math