Some work on annotations
Merge branch 'master' of https://github.com/eclipse/vert.x