Update versions on 2.1 branch