Fixes #786
Merge branch '2.6' of github.com:xetorthio/jedis into 2.6