C++ fix: change to fabs
Merge remote-tracking branch 'origin/master' into cpp-fix