Use 2.1.1 everywhere