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

Signed-off-by: nscavell <nick.scavelli@gmail.com>
Merge pull request #865 from nscavell/836

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