with 'head').
Test fix (this sync_with_master was nonsense).
Now all tests pass in 4.0 in autobuild.