Small change to avoid an if gives approx 10% speedup
Merge branch 'master' into float_internals