Support 3.1.x and 3.2.x as well.