Manually merge PR https://github.com/eclipse/vert.x/pull/829

Signed-off-by: nscavell <nick.scavelli@gmail.com>