Re-fix fp64 warning avoidance
Merge branch 'master' into cffi