Upgrade to Vert.x 2.1.1