Merge branch 'physics_fixes' into nacl_changes2