Merge branch 'master' into trig-ab-function-family