Fix test. I guess.
Merge branch '4.2'