Update to 2.1.x development version