mptt fix after import
Fix the test suite
Merge commit '4759238c1380ade5ffc3a993c01e000c9d903b1b'