Merges https://github.com/dunedain289/redis/commit/8c3ac2b249b279235ac635acdf7eaa8829d92d70