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

Assuming you verified the original PR was good :)