minor wibbling
Merge branch 'master' of https://github.com/vert-x/vert.x