Fixed a broken test on 3.x
Merge branch '1.0-maintenance'