sync to vertx 2.1.1