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