Whip post 1.5.3.3 maintenance series into shape.